updates
merged
moar
edited tetsing
merged
ets
moar tetsing
resolved
cleaned up
testing moar