Should probably commit this before I break it again.
Kinda better I guess, maybe