now working, still bad looking though