Update #12

Resync Github with past work