In the process, to prevent an infinite recursion bug, transitioned to a proper local allocation system