Move faye into it's own class