Revert "Working in base model"

This reverts commit 4c1c25cc2361e1a0bb06a404bdbb76708eafc6db.