[master] Initial implementation