@timmccall-wf I've attempted to remove most of the constructor content into separate functions. Let me know what you think of the current code state.