WIP dont worry about this or the Dupe branch
almost fixed