Making it work!

Always happy to make changes, but this seems to do the trick. Let me know if anything should be done differently.