- fix top level entity
 - get thing to almost build