Write a bunch for GH-11
Got second part of GH-11 done