Better user interaction

May close issue 6