[WIP] Refactor

Closes #4.