Began work on sving, minor changes
Fixed merge conflict