Added model and test. Not integrated yet.