Adding unstable changes & some basic functionality to the models