Test branch

added all functionality