added dumps and hacky draw