Merging changes from old lab
Fixed up the code, it looks spiffing now
Cleaned up the code even more, replaced tabs with spaces