The Design And Fabrication Of Non-Planar And Solid State Lithium Ion Batteries