Code Review

I'll be pushing a few commits in here, verbose explanations for each can be found in the commit messages.