Added code base (work in progress)