Version 0.0.5 using ajgenesis/models
Fixing merge