Rewrite. From scratch. Dalek now is pulled in as a library & won't be called via CLI anymore
Merged