Semi working thingy where I've moved stuff around... maybe broken