merged the two apps together and its pretty broken