add: test and impl plan + some formatting