WIP
add build
merge gulp