Finished main part of hw. On to xtra credit