Rudimentary services support
Placating jshint
Updated todo.org