WIP on short loan requests support - almost done