Stage one and a half of changes, not usable