Edited some. Still need fixes