Updated drill code to be cleaner. Also added more shapes to the drilling.