Initial commit take 2. One test passing. Yay \o/