Overhaul1 - It works!

Added several function calls and variables.