Still need to add support for $rmod.resolved but everything else should be working and tested