Works, bugs still there
Next round of changes, goin into testing
workspace update