@crossracer almost done...