Staging

Works like a charm #15