classes now compile, need to update maps