Adding stuff
Added start/stop buttons
resolving merge conflicts
Merge branch 'idofxeno-master'