Fixed a bunch of problems, everything works together at MVP level. Wooo terrible commit messages!