For Steven
Fixed some errors
Functionality complete