Started playing around with throwing exception for errors.
Merge branch 'develop' into feature/exception
Fixed formatting.
Merge branch 'feature/exception' into develop