Finished (maybe, one big maybe) homework two