Design update

Added methods to collection, changed variables to private, pseudocode
and test comments