Final Version

Cleaned up, working version