Committing so Amanda has more up to date code. Nothing works yet. Urg.