Almost ready for DnD now