Added eric's file, not finished yet