Initial checkin of functioning code