Got a few tests passing. Still 7 more to go.