revert everything....again. Looking for a better and cleaner way to do this