Removed button and events, added pragma marks and added another function
workspace stuff