Started writing some code for fx support