wip.
updates.
renaming etc.
more updates.
Merge pull request #1 from jejacks0n/WIP

Wip