Slightly broken style additions, but steps forward taken.