#46: About to remove old stuff
#46: overhauled some stuff

Need to fix some things too
#46 suppressed warnings in constructor
#46: about to do some serious changes