little changes and additions to the funcitionality
Merge branch 'scala_version' of github.com:Danny02/DarwinsBox into scala_version
dunno why merge