created new branch for this. everything is going fine, i think...