Fixing issue with last commit

last commit a few classes didn't seem to get pushed to remote. This
should hopefully resolve that issue