More work on unifying things, currently broken