Added all functionality

yep