Revert previous commits, needs more thought