Completes part One and Two