Added test classes, a few bugs fixed; This render thing is kind of tricky to figure out, can't locate it 100% to where the problem is, will keep looking