Started to re-organise kitchen sink example