Updated the general structure of everything, it's much better now.