Sorta working, added some stuff, moved stuff around.