Initial commitement of working code