Updates and class adding
getting ready for rp change