Feature/add lines served

Some funky spacing happening here...