Add some model functionality, battle with some spec mocking.