+r really works now... really should merge thisin.