Intial implementation and test