messy commit need to clean up a lot of shit