SOOO much clean up. Still have some weard ass bug with a few #includes though.