New inheritance #19
Fixed inheritance in states, removed private funcs