Version 0.2 WIP Build 3

- Added the needed switch methods
- Cooler comments
- some tweaks