Cleaner build.

Next, trying to find a better solution for z ordering before proceding to physics.
Probabily gonna do something in Bazinga! Edit, not in here.