clean up
almost final. clean up to do
restructure
ff
puke
validation
Buggy