Began testing new interfaces and implementations. Will add JUnit tests soon