Mashallah Additions

This is all working, but getting it set up may be tricky, let me know if you can't get this running.