Merging task 2 to main.

Done with task 2  mostly. File IO still not working.