Created more code and tests..