Simplify building shapes. At first glance  this slashes export size in half and almost doubles speed of convert.py run. Closes #5