going to conflict
merged
fixed tests
moar tests
herpest merge
fixed byte bugs