Initial commit
Initial commit
Add new prototype files / started the mechanics
fix conflicts