Changes

I've made some changes. Still working to deal with the pointer issue.