Thought I had #2 covered, should fix it now though
Removed some unused stuff