Initial commit of copy from @kevinSuttle
Updates and stuff