Finish up previous commit (didn't realize i was this close to finishing)