Added initial models, tests