Still not working but making progress