Working still on functionality testing