More changes

Project potentially on hiatus for this week