Added new event
Cleaned up a bit
Currently not running on pi, according to upcoming changes in camera handling