Mostly working and much of testing completed