First pass implementation

(We haven't run make yet)