Make system almost done, needs cleaning