adding some bare minimum features in prep for submit