Began work on notes (adds bugs)