Pre-2D clean up! Basically just changing interfaces to be more generic
for when 2D is added.