major updates. still not functional but getting close