added first build implementation

 + some improvements