test
more stuff actually working
mostly ready for the ML
final for me/UBhacks 2013