More classes updated with missed changes. Getting closer!