Features/1437 1432 basic setup