Major updates, got to where I needed to go