Resolved errors. Testing would be appreciated.