Major Updates

Too many to list, luckily it's just the dev branch!