Old Changes

Committing some changes I made 6 months ago but never put in the repo