finishing 0-1200000 and making the main function more useable
merge commit