Fixed shooks djanx test, more progress on revised compose stuff