WIP; Cleaned up, fixed deps, optimisations

Expanded and cleaner CLI, cleaned up code