Added functionality and passed JUNIT test - 11/04/13