Initial commit cleanup.
Initial logic.