Initial Commit
-Cleaned up some more code. Added NSCache
Merge remote-tracking branch 'origin/Dev'