Revamped so that it even runs