moved stuff around, experimented with r.js/almond