Now would be a great time to put forward a simpler solution to 2.0 so yes please post a completed version!