Add more buttons..
add tests of moria in model logic