Getting caught up

There were a LOT of changes