Super-WIP logic commit
Merge pull request #27 from ndhoule/dev-no-board

Super-WIP logic commit