Now we Work on using variables.
Huge rename to resolve some of name conflicts