Committing some initial wip.