Added some first bits of implementation