database restructured... incomplete (working)
lots of changes, component views mostly working