Move some things around
More moves
Add a kitchen sink example (beginnings of one at least)