WIP stuff. Inlcuding new allocator (broke atm)