add() code complete. Testing mostly complete. Still some doubts.