comments #7 - income crud, but with failing tests

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'income' into develop