wip
Rewrite
Configure for release