Have it partially working