Geometry refactor; radius template working; template actions started