sorry for all the commits, but this is one Bad-Ass commit