adding more features, need to fix JSON submit