half done with adding workspace fields all over