commiting to pre-ajax so I can switch to ajax branch