Cleaned up object finder and todo