Final submission

Stripped out other functionality and included only my submission