fill out some stubs and restructure a bit