* Stub out some more methods
commiting for merge
Merge remote-tracking branch 'simon/master'
working on the control flow