started adding things, still all funky