Added universal electricity api, started glass former, and

other small fixes