Work still in progress, just pushing now so i don't loose everything if my anything happens