Work in progress, still some DB work left.