Tiff branch

Let's combine these, we can start branching once we're talking about major changes and we want to keep a snapshot of something working and stable.