Revamping some things, please be patient with me if things appear broken.