Updates to the initialize method and add functionality to other methods