ready to merge in directive
finished admin panel