Reworked how cells are added, begin design of custom cell