Move faye into separate class