Feature/loan stage