Initial commit of cleaned up p3