Refactoring instance builder.  Felt this was a more appropriate and extendable solution.