Removing Q, building some basic tests
No more Q; basic development
Ignore my whiteboard