Commiting the rest of the code for the Tip Engine
Committing merge of Consumptionervice