filed add
working on admin panel
merge conflicts