Lots of changes

Sorry, it’s been awhile