Class Now In Seperate Files.