Move toward final solution
Added todo
Added proto stuff