Fixed issue where we were initializing more than needed, suspect this is a common bug throughout the program