Modified files and finished most of the testing.