BM-349 First implementation

...still buggy...