Making progress with draw, but still broken. Will fix soon.