The local search should now be at least testable. Added a lot of comments.
Fixed conflicts in board