Go through allocations, clean them up and make sure there is actually a decent allocation strategy

[moosichu]

Allocations are handled quite sloppily at the minute - we need to be a bit more robust with them generally. Haven't quite figured this one out, there's a fair few TODOs in the code that tie back to this issue as well.