File comments
Integrated events in to BaseState class