Feature/solider v0.01