Revamping in progress, not working. Needs to be compared to older commits.