Final bug fix, absolute final project commit

Submitted for final grading