huge commit, ready to test