Optimised Logistics some more. Lifting is now in it's own file.