Added State class, got rid of empty methods
Merge branch 'dev'