First cut of Format Selection support

Some common scenarios still not working here!