Mihir | Tests passing, can remove debugs now