figured out that this branch has most up to date content, so got ascensor working with it and going to merge with other branches