openscad stuff
fixing TODO list merge conflict