Push what I have and works so far