Going through a few errors. Will be many commits today, with only small changes in each.