Merge with fao bot to collaborate on phonypony instead of working on two different solutions