Updates to the Surrounding Code

Updated the code to use the FurtherSurrounding functions to run the
other ones. Code is tested.