Probably better to put it all here or atleast gather all of it after it has been done in one place to keep track of all the changes for V2
