Initial working structure.  Pending hackjob approval by Koala.