Overwriting from existing project

Overwriting previous stubs with code that we worked on last night.