Some more changes.. still in prototype phase. There are several problems that need to be solved.