Skip to content

Partial refactor

Partial refactor #247