Fixed namespace issues and commented out some code that doesn't work yet.