more changes
more renaming
Merge pull request #2 from BackEndCoder/master

nearly there