more front end ish
real merge