pretty much basically working now

git push