Adjustments to codebase to prepare for 3rd iteration.