Better architecture overall, #read fixed, DSL works