This adds notes and a lot more. This branch had way too much work on it without commits.