Reworking of some things to allow for stable easy development