might as well commit everything i have for now