all of this is working now