Updated schema and nearly operational
Works
Removed crufty file
Added test
bugfix
rearranged