Skip to content

Separate out logic

Separate out logic #7