Refactor to base and CREATE suggestion forms