Initial work on importing