Initial prototype working
Cleanup