Starting with the propper changes

+ started by and worked on list