Include basic stuff in first commit