Completed interface methods and others, junit tests now pass.