Beginnings of rent calculation plus some tests, very WIP