Resloved #15, Started working on #19 a tiny tiny bit