Added switch functionallity!
0.03