Start splitting patterns out into separate files (only use what's needed, less bloat)