A Further Course in Algebra, Describing the Structure of Abelian Groups and and Canonical Forms of Matrices Through the Study of Rings and Modules