basically done

Needs alot of cleanup but the baisc functionality is there
..