100%, I haven't put in a fulsome effort yet but this is my plan too. A second bathroom for the second bedroom even better -- just in case a housemate becomes necessary. An apartment won't appreciate like the money will but the benefits of a place you own are significant too.