lots of changes; throwing all the frameworks
more cleanup
more design changes