Maybe getting closer... fixing what I maybe broke eralier...