first real commit
may have lots of bugs
update query 1.11.1 & modernize 2.8.3