Added all design todos on #161