Got push working

Got Push working. Not tested well yet. Renamed a few things.