more or less done with this for now