Updated to give basic functionality to models