merged projects

some extra junk, i'll remove later