Lots of changes here, some no worky, some worky very good