Some debugging

Not completely debugged