Finalized base models. Started adding some tests.