Added types, no types for function arguments yet