Initial commit, pt. 5

Almost complete