basic features working, tests complete