Major Functionality Changes

Merged files that we worked on with new files that have more
functionality to them.