Importer from the old RP is done. As well as some work on #8
This will create a new commit in order to revert the existing changes.
