Nearly done

Almost everything works, missing some "p" events for some reason