pretty much working now