First base merge

Revision 3: basic merge.