Added all features for a first release -> still testing