Added trootlololoo comment
lalalal
merged some code
marged
merged