Fixed the major bug, its now basically a working proto except for corner cases