Added Model lib, updated init funcs