Initial commit of work done so far