Change the implementation plan to fix some issues

Closes #1.