Basic functionality and tests
Fixed something