Get a basic list going
Bunch of improvements. Awesome commit message right?