All done! I'll be a bit of a read but I took some liberties to address some things with the main situation.