First working prototype
Fixes