Add fabric stuff, in progress