Finished initial revision of execute. Let's see how this goes.....