Completed some of requiered methods and added method headers/comments