updated state of things. Will clean up in the future