faq and todos
merge