Working add, despite some bugs.