NEW: Added some basic assembly setup