reorganized structure of schtuff
tests passing, model a changing
take this out put this in, start of wireframe impl