Punchblock 2.0 compatability

WIP