Done for the night. Will finish tomorrow