Touch-ups, need to keep working on cross-over implementation