merged in intial stuff