Logically seperating some methods.
Make this more modular.
Whatever man