Create own version of assembled. Seems working
Cleanup a bit