still working on it/ last commit for the night