Fix errors; Add sockets to base view