More updates to code seperation and graphite integration