More Testing. Going to make more modular