Version 0.5 DEV Build 21
- Moved thing's into functions