hmm - can we please move to controller classes, which can be unit tested instead of these ajax files? THX