First implementation

Not TODO anymore