First round upload

Added all features just left need to modify the actual query now and
upload for testing...