Moved fx stuff into seperate class