Second commit

Combining working files.