Compiled recent additions, now testing.