Mostly working, just missing some edge cases
Don't commit workspace stuff