initial problems
added lil bit
merged
mergin