Initial attempt at Persona support (#359)

Please review and let me know what else needs fixing.