migrated in existing waterilne models, fixed loading and added a test to ensure models are being returned correctly