Everythings gone
new test outline
fixed merge