Re-Worked a ton of stuff....