Skip to content

Solved some TODOs

Solved some TODOs #58