Work in progress, creating a bad model for the RB-APF
Cleanup and bugfix for time-index in apf