last commit fulfilled a something on the TODO. yay