adds 'swap' and 'as' to Objects class
messed up the commits, blah just merge them all