admin part almost done by jamie 20141024