Refactored to reflect DRY principle
Commented out form stuff for Lance
Merge branch 'work'