Added basic events, finished switches in current structure. STuff
Merged