Cleaned up code, need to fix render order.