Completing the initial implementation