Lots of changes mostly working

Few things need to be changed but close now :+1: