Work refactor, added initial support for work operations