Finished up, can't test

Needs to be overlooked and possibly revised.