Refactor is a go

Closes #65
Closes #64