Changed to utilize modules, finished exercises.