Initial draft implementation