Basic functionality is working, tests pass