initial push.
merged stuff together