More work in progress stuff

Small change, but I wanted to commit before refactoring RpgClass