Made some final touches to formatting. Around 95% complete