Add some error handling and more bools