Seperate class and main files ...