Lab 5 update to merge with master and rebase