Added model support
Added more null checks
More work on rendering