Continuing Documentation & Refactoring

Much better code now. Much more readable.