Feature

New feature
maybe best solution is use switch statement