Adding working changes to neaten branch