Feature/static

closes #5