Intermediate Commit

(still not functional) Added argument replacing methods