Finished for today, updated TODO with what I should do tomorrow. Should be able to get something working by Saturday