Engine rewrite; some gprahics removed, others updated