Initial commit still a work in progress.