Great changes :)

Make the first part of the project work