Unit Testing complete, Main system near completion