Completed initial implementations of all methods. All tests passing