Xatunix

Not sure how I accidentally caught up 6 commits into this PR. Please let me know if I did something wrong.

Thanks for the detailed thoughts (some of which made me facepalm)! I'll revise accordingly.