Re-work to use constructor.