Fixed wave charge. Almost ready to be merged.