Added lots of stuff maybe I don't remember really