Initial work

Can use diamond operator here.