basic features all working
merge remote origin