Added items to todo list
Refactored spree message code