Added some prototyping for source importing