not totally ready yet, they're both in here though, gchat me if you need
anything?