finished first full run-through of implementation