Third Attempt

More bugs, more fixes