Work on tool positioning and add layer methods