Movement overhauled, Event prototype added