More restructuring. User can now add a tip