Fixes #19. May induce race conditions in the UI, but this can be looked at in further testing. As of now, it seems stable and performs properly.