More progress, about to do drastical changes...