Merging Code Refactor

CODEGUIDE contains new systems. Update as needed.