Initial commit form existing code