Removed and updated, still working on it, don't use this yet