todo
update and clean out gems a bit