Assembly Control

New and changed functionality