stoned. stopping for the night
fixed build; merging into master (still needs debugging)