second draft, front end static done
merging