Major checkpoint - all base files working