Breaking up installer this way for now.  I need to consolidate things a bit in the near future.