Big update, Stage1 almost done, structure for Stage2 and Stage3 layed out