Removed all errors, still need to test