Contrib/initial

Initial implementation