Work in progress on getting ams support behaving.