Finished up the bulk of the implementation - no testing just yet