Filling out scaffolding

1/2 done.