Experimental Alpha 0.03b

Cleaned up code, still trying to figure out what I did wrong on line 127
& 128...