Lots of changes

Planning to do pretty big updates soon.