Beginning to add workspace functionality