Merged code

Merged two branches. Still have some work to do.