WIP: still double calculating rent