tons of new code, nothing is working just yet