Added new events + added state manager to window