jp368's comments
merging
problems with parenthases
velocity broke
velocity's fixed
ACTUAL final commit this time