First Pass at adding inkjet support