prelim revision

i will commit a better version later tonight
I need to research at B&N