Round out presentation. CI still pending, specs could be improved