finished basic functionality and removed test stubs