Started work on max / min size support