Working on swap, still needs work
Fixing merge conflicts with main and objectclient
Middle attacks relatively functional
Fixing merge conflicts