Completed bug fixes

Completed bug fixes and implementation prior to valgrind testing.
Initial commit of Driver file.