seg fault
still segfaulting
bug is fixed
done
Merging bugfix/gaia into features/gaia.