courier view mockup
add ignore
merge
other crap