Layering prob
Added more model methods