Fixed up some stuff necessary for notes to be added. Not quite finished yet.