devel-quad into devel

This is already working, but needs some code-cleaning and further testing.

Works with yarr's devel-localdb