usual default stuff + started coding
merged