Buncha changes, not logged exactly which ones but will all be logged when finished going through todo list.