Initial commit, can't complete right now. Not correct architecture. D'oh.