#20: more implementation, making things nicer

Task-Url: https://github.com/mgatz/sunrise/issues/issue/20