Getting TODOs done, Rename classes on spec

Little help with the TODO's.

There's some specs failing... I'm on it right now.