Ported some functions, pushing for workplace switch
Current state does not compile