Added the rest of Fen's stuff