Rebase

Rebased off of Open Source Code