Fixed namespace issues; solution now builds.