Finalizing our naive first iteration