Heating the babies room in winter!

Hi all, I wasn't sure where to post this, but here goes, we just bought our first home, (yay!) and we currently have baseboard heating in all of the rooms. For the boys room we want to take the baseboard out and put in something that will be a little safer and more efficient. We were thinking of a wall heater or something similar, not a space heater. Does anyone have any recommendations? We hope to get forced air, or central, that goes through the whole house, but because our home is older it will be more expensive and therefore will not be getting done for another year or longer. TIA