removed old file
Made stuff identifiable, changed ids to longs