FIrst release

Still some improvement TODO