Abstracted the project a little bit more. Organizing and such.