Add first basic implemenation