Updates

Part 1 of Project
Part 2 and updates