Mini Commit 11

Elements [part]

this is taking a while...
Mini Commit 12

Elements [part] [final]