Lab 7 - Added fixes. Completely works.