Breakfast Progress

Refactoring and testing