Experimental

Fixes quite a few minor bugs with the recent rewrite