Feature/simple billing