Working on reverting, still work in progress