Various

Change to 2D, added DataLogic, ...