Initial commit with workable code