Made it MUCH more modular, different methods for each get