Updateing the file

Bringing the project up to speed on the most recent changes