Specs passing... really itching to merge this with master, as the rebases the last two times were REALLY painful.