Add some stuff 

Finalized