beep boop upgradein stuf

Added tests, fixed syntax, etc etc