2.0

Some great ideas but I found the execution awkward to read