working out some major kinks, time for bed commit