Too many commits I need to do this smarter