Externalized some symbol parts, some work on partial generation