commit pre-merge
apache update, index and backend
my handlers, joe's stub stuff