Final commit for working gantry