Tests work, all of the peices are in place to finish this thing off