Still brutally beta. Next commit will have less code cruft