Pulled the creation of companies into its own class, renamed & refactored a bit.  TODO: empty customer & customer with 1 param -mbb