Now compiles
moving tools
First example working in new layout