Refactored all the code.  Just making things maybe a little better
organized.