Update to current

This updates after a few days of coding