Cleaned up a bit/organized. Ready for links (for the most part)