most things actually work now (with test data)