Still fixing bugs and errors.