Initial checkin of stuff that does actual work