Fixed. not yet 100% functional