Added pretty basic functionality