Stripped down main branch to bare basics