Added tests/specs ... not all passing, yet.