Initial Commit
Modified to play well with others
Merging with github