Changed file names to match class. Added more methods