in an effort to get a working model in before it gets too late, i present, this commit