initial upload changes for Nicorette wip