minor changes, needs a lot of work

Needs work. Need to properly debug