Merge pull request #1 from JaniM/master

JaniM fork to misthema master
Incomplete - task : Finish BaseUnit 

- Continued on BaseUnit
- System got mad, reinitializing.