First commit that integrates both of our codes

What we each have so far has been integrated together onto single code
files. No other changes have been made.