shovey insert/update stuff, some tweaking