cleaned up code
merged.
starting new file