Still not working but getting there