Switching models over to a more clever layout. Some parts are broken.