Finalize some model peices, make basic tests work.