changed package mode to line
Swiched back to one package at a time
Merge branch 'working' of https://github.com/bregell/server into working