Everything seems to be working now. Comitting before cleaning out debug/testing-stuff.