no styling yet
added styling
merged changes