Added basic functionality, second test passed.