Pre-Complete

Only battery bar remains to do