Some more changes, still initial design phase