Execute Tab now working

- The Execute Tab is now working and complete
- This also includes a rebase to get Peacock-2 branch up-to-date with devel