Working out some bugs.