adds guidelines and styles more stuff
merge