Added new features

might not stay though...