Started to clean-up the main rip.py file as well as the templating system.