refs #2 - Wrapped up some of the code, but it still is not working properly
refs #2 - Wrapped up code edits