Branch set up
Added functionality and passed JUnit tests as of 11/04/2013