wip
splice added
bunch of fn added
minified
merge
minified