Run some methods inline

Some changes, going to move everything to arguments later.