Did basic cases of subset two. Added TODO statements for things I've missed or
should work on next. Made sure that indenting is retained.