Splitting new and create templetes for now