Added functionality and passed junit test 11/4/13