This is my final commit for Norm 3