added Cdr, Cons, experiented with codeforms
merged conflicts
removed unneeded files