Added charges and wave simulations, neither of which are complete