finished, ready for testing till tuesday