beta 3, think its all working now