Do a bunch of refactoring in the process. Current display on homepage is a little shonky but that can be improved when there is something using it.
