Pushing what I have so far working to continue later