Started working on converting to ajax