Working copy

First step of front end integration