initial stubs commit
minor tweaks