Starting to Lock Down the Classes