Major modifications to bring the codebase up to a pre-alpha stage