Working to add sharp / flat support