moved changed execute method and moved things out of __construct