finished front end, working on admin