Cleaned up, going to try and remove the errors var now