making some progress, yay!