Latest Progress

Need to fix a few more bugs.. last one!!