Commit 93

More updates and fixes to boundaries. Getting closer to a solution now.