Codebase (All)

Made some major amendments to the code base. Looks really good.