Quick code sync

This code is 95% working now; but we -NEED- assets.