use better path
some cleanup, use $app more
make a push method