Beta.v1.5

Full rewrite begins =/