Removing old code, reworking system; dev 0.3.5