Working on model architecture...

Incremental commit.