Rewrite

Closes #3