Final push for part A, put everything in one project.
Actual final push

Github decided to detect more changes after I committed.