All up to date and working and merged to master