Merge pull request #345 from etosch/untested

Untested
wow. that actually worked the first time (refactored schema)