Feature/tipping

Merge me please.