Re-working my code. Fixing silly issues that should have never happened.