pretty much working now
.