I think it's done, just gotta clean up